Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync opencraft-release/redwood.1 with Upstream 20241028-1730074895 #704

Open
wants to merge 23 commits into
base: opencraft-release/redwood.1
Choose a base branch
from

Conversation

opencraft-requirements-bot

Syncing opencraft-release/redwood.1 with Upstream

Important❗

Please always use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

Note on Conflicts ⚠️

In cases of conflicts you can go ahead and resolve it here on Github if it is simple enough. However if it is a more complicated conflict please follow the steps below:

  1. Check out sync-open-release/redwood.master-20241028-1730074895 locally:
  2. Pull latest changes from opencraft-release/redwood.1 into that branch, make sure your [REMOTE] is pointing to opencraft-release/redwood.1:
git pull [REMOTE] opencraft-release/redwood.1
  1. Resolve the conflicts locally, then commit the result. This will create a new merge commit.
  2. Push the new merge commit to sync-open-release/redwood.master-20241028-1730074895 to update this PR
  3. Review the PR again and merge when ready!
    Note: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

Asespinel and others added 23 commits June 20, 2024 10:21
…smiss button (openedx#34914)

This hides the survey report banner from the Django Admin for a
particular user for one month after they click on the "dismiss" button.
This is done completely on the client side using localStorage, so the
same user could see the banner again if they're logging in with a
different browser.
chore: update Django to 4.2.14 for Redwood - Security Patch
…social_auth

Feanil/backport django social auth
…) to redwood (openedx#35248)

* fix: disable submit button for archived courses (openedx#34920)
We sometimes see rendering errors in the error page itself, which then
cause another attempt at rendering the error page. I'm not sure _exactly_
how the loop is occurring, but it looks something like this:

1. An error is raised in a view or middleware and is not caught by
   application code
2. Django catches the error and calls the registered uncaught error
   handler
3. Our handler tries to render an error page
4. The rendering code raises an error
5. GOTO 2 (until some sort of server limit is reached)

By catching all errors raised during error-page render and substituting in
a hardcoded string, we can reduce server resources, avoid logging massive
sequences of recursive stack traces, and still give the user *some*
indication that yes, there was a problem.

This should help address openedx#35151

At least one of these rendering errors is known to be due to a translation
error. There's a separate issue for restoring translation quality so that
we avoid those issues in the future (openedx/openedx-translations#549)
but in general we should catch all rendering errors, including unknown
ones.

Testing:

- In `lms/envs/devstack.py` change `DEBUG` to `False` to ensure that the
  usual error page is displayed (rather than the debug error page).
- Add line `1/0` to the top of the `student_dashboard` function in
 `common/djangoapps/student/views/dashboard.py` to make that view error.
- In `lms/templates/static_templates/server-error.html` replace
  `static.get_platform_name()` with `None * 7` to make the error template
  itself produce an error.
- Visit <http://localhost:18000/dashboard>.

Without the fix, the response takes 10 seconds and produces a 6 MB, 85k
line set of stack traces and the page displays "A server error occurred.
Please contact the administrator."

With the fix, the response takes less than a second and produces three
stack traces (one of which contains the error page's rendering error).
…page-render-recurse

[Backport] fix: Prevent error page recursion (openedx#35209)
* feat: course about page markup and styles improvements

* test: update tests according to changes

* fix: relocate course organization and return removed prerequisites info

* fix: display org info above the course title

---------

Co-authored-by: oleksandr.buhaienko <[email protected]>
Co-authored-by: Eugene Dyudyunov <[email protected]>
…ood-4.2.16

chore: update Django to 4.2.16 for Redwood - Security Patch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.